Autogenerated HTML docs for v1.6.0-rc1
diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt index 7da62d0..2542cf5 100644 --- a/RelNotes-1.6.0.txt +++ b/RelNotes-1.6.0.txt
@@ -15,6 +15,9 @@ scripts to use "git xyzzy" form, as we will stop installing "git-xyzzy" hardlinks for built-in commands in later releases. +An earlier change to page "git status" output was overwhelmingly unpopular +and has been reverted. + Source changes needed for porting to MinGW environment are now all in the main git.git codebase. @@ -179,6 +182,10 @@ * "git rerere" can be told to update the index with auto-reused resolution with rerere.autoupdate configuration variable. +* git-rev-parse learned $commit^! and $commit^@ notations used in "log" + family. These notations are available in gitk as well, because the gitk + command internally uses rev-parse to interpret its arguments. + * git-rev-list learned --children option to show child commits it encountered during the traversal, instead of shoing parent commits. @@ -196,6 +203,9 @@ * git-status gives the remote tracking statistics similar to the way git-checkout reports by how many commits your branch is ahead/behind. +* "git-svn dcommit" is now aware of auto-props setting the subversion user + has. + * You can tell "git status -u" to even more aggressively omit checking untracked files with --untracked-files=no. @@ -215,8 +225,15 @@ All of the fixes in v1.5.6 maintenance series are included in this release, unless otherwise noted. +* git-clone ignored its -u option; the fix needs to be backported to + 'maint'; + +* git-mv used to lose the distinction between changes that are staged + and that are only in the working tree, by staging both in the index + after moving such a path. + --- exec >/var/tmp/1 -O=v1.5.6.4-432-g6796399 +O=v1.6.0-rc0-104-g81dc230 echo O=$(git describe refs/heads/master) git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
diff --git a/config.txt b/config.txt index 798b551..1a13abc 100644 --- a/config.txt +++ b/config.txt
@@ -92,7 +92,7 @@ # Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true [branch "devel"] @@ -563,9 +563,11 @@ diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the - given command. Note: if you want to use an external diff - program only on a subset of your files, you might want to - use linkgit:gitattributes[5] instead. + given command. Can be overridden with the `GIT_EXTERNAL_DIFF' + environment variable. The command is called with parameters + as described under "git Diffs" in linkgit:git[1]. Note: if + you want to use an external diff program only on a subset of + your files, you might want to use linkgit:gitattributes[5] instead. diff.renameLimit:: The number of files to consider when performing the copy/rename
diff --git a/git-config.html b/git-config.html index ef0513f..ce34a34 100644 --- a/git-config.html +++ b/git-config.html
@@ -669,7 +669,7 @@ <div class="content"> <pre><tt>; Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true</tt></pre> </div></div> <div class="literalblock"> @@ -830,7 +830,7 @@ <div class="content"> <pre><tt># Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true</tt></pre> </div></div> <div class="literalblock"> @@ -1542,9 +1542,11 @@ <p> If this config variable is set, diff generation is not performed using the internal diff machinery, but using the - given command. Note: if you want to use an external diff - program only on a subset of your files, you might want to - use <a href="gitattributes.html">gitattributes(5)</a> instead. + given command. Can be overridden with the `GIT_EXTERNAL_DIFF' + environment variable. The command is called with parameters + as described under "git Diffs" in <a href="git.html">git(1)</a>. Note: if + you want to use an external diff program only on a subset of + your files, you might want to use <a href="gitattributes.html">gitattributes(5)</a> instead. </p> </dd> <dt> @@ -2686,7 +2688,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-26 06:45:38 UTC +Last updated 2008-07-28 00:02:59 UTC </div> </div> </body>
diff --git a/git-config.txt b/git-config.txt index 697824c..28e1861 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -222,7 +222,7 @@ ; Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true ; Proxy settings
diff --git a/git-log.html b/git-log.html index 48e9525..d6f956b 100644 --- a/git-log.html +++ b/git-log.html
@@ -874,7 +874,7 @@ </dt> <dd> <p> - Show only commits that affect the specified paths. + Show only commits that affect any of the specified paths. </p> </dd> </dl></div> @@ -2030,7 +2030,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-24 04:02:42 UTC +Last updated 2008-07-28 00:02:59 UTC </div> </div> </body>
diff --git a/git-log.txt b/git-log.txt index 5a58d5b..05cbac5 100644 --- a/git-log.txt +++ b/git-log.txt
@@ -58,7 +58,7 @@ its size is not included. <paths>...:: - Show only commits that affect the specified paths. + Show only commits that affect any of the specified paths. include::rev-list-options.txt[]
diff --git a/git-submodule.html b/git-submodule.html index 0c1b2a5..d133620 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -375,7 +375,7 @@ <p> Add the given repository as a submodule at the given path to the changeset to be committed next to the current - project: the current project is termed termed the "superproject". + project: the current project is termed the "superproject". </p> <div class="para"><p>This requires two arguments: <repository> and <path>.</p></div> <div class="para"><p><repository> is the URL of the new submodule's origin repository. @@ -533,7 +533,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-20 01:23:35 UTC +Last updated 2008-07-28 00:03:03 UTC </div> </div> </body>
diff --git a/git-submodule.txt b/git-submodule.txt index 829b032..35efeef 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -63,7 +63,7 @@ add:: Add the given repository as a submodule at the given path to the changeset to be committed next to the current - project: the current project is termed termed the "superproject". + project: the current project is termed the "superproject". + This requires two arguments: <repository> and <path>. +
